Document extra reason to allow not existing dir in `EXTRA_CONF_DIRS`, fix unable to change Twitcher logging level #410

tlvu · 2023-12-11T18:19:25Z

Changes

Non-breaking changes

Code documentation: provide an additional reason to not exit early if a directory listed in the EXTRA_CONF_DIRS variable does not exist.
Twitcher: unable to change log level because of typo in qualname config

birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false

…RA_CONF_DIRS

…config

mishaschwartz

Can we change up the wording a bit?

Maybe I'm just tired but it took me a while to understand what you meant initially.

mishaschwartz · 2023-12-11T18:34:06Z

CHANGES.md

@@ -15,7 +15,12 @@
 [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
 ------------------------------------------------------------------------------------------------------------------

-[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
+## Changes
+- Code documentation: extra reason to allow not existing dir in `EXTRA_CONF_DIRS`


Can we change this to:

Code documentation: provide an additional reason to not exit early if a directory listed in the EXTRA_CONF_DIRS variable does not exist.

(or similar)

Thanks, updated. English is not my native language!

mishaschwartz · 2023-12-11T18:36:47Z

birdhouse/read-configs.include.sh

@@ -126,6 +126,14 @@ source_conf_files() {
          # fix immediately.
          # The new adir with typo will not be active but at least all the existing
          # will still work.
+          #
+          # Do not exit on not existing conf dir also allow for smooth


Suggested:

# Not exiting also allows for a smooth transition when component paths change between updates.

This one I decided to keep the specific part about not existing conf dir because it is code comment so should be more precise. New wording: "Allowing not existing conf dir also helps for smooth transition of component path when they are new/renamed/deleted."

crim-jenkins-bot · 2023-12-11T18:56:36Z

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/2359/
Result : failure

BIRDHOUSE_DEPLOY_BRANCH : update-code-comment
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-20.rdext.crim.ca

PAVICS-e2e-workflow-tests Pipeline Results

Tests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1477/

NOTEBOOK TEST RESULTS

    
[2023-12-11T18:33:24.939Z] ============================= test session starts ==============================
[2023-12-11T18:33:24.939Z] platform linux -- Python 3.9.16, pytest-7.3.1, pluggy-1.0.0
[2023-12-11T18:33:24.939Z] rootdir: /home/jenkins/agent/workspace/PAVICS-e2e-workflow-tests_master
[2023-12-11T18:33:24.939Z] plugins: anyio-3.6.1, dash-2.10.0, nbval-0.9.6, tornasync-0.6.0.post2, xdist-3.3.1
[2023-12-11T18:33:24.939Z] collected 265 items
[2023-12-11T18:33:24.939Z] 
[2023-12-11T18:33:35.500Z] notebooks-auth/geoserver.ipynb ..................                        [  6%]
[2023-12-11T18:34:10.224Z] notebooks-auth/test_cowbird_jupyter.ipynb ..........                     [ 10%]
[2023-12-11T18:34:15.372Z] notebooks-auth/test_thredds.ipynb ...........                            [ 14%]
[2023-12-11T18:34:24.353Z] pavics-sdi-master/docs/source/notebooks/WCS_example.ipynb .......        [ 17%]
[2023-12-11T18:34:34.441Z] pavics-sdi-master/docs/source/notebooks/WFS_example.ipynb ......         [ 19%]
[2023-12-11T18:34:38.395Z] pavics-sdi-master/docs/source/notebooks/WMS_example.ipynb ......FF       [ 22%]
[2023-12-11T18:42:26.342Z] pavics-sdi-master/docs/source/notebooks/climex.ipynb ............        [ 27%]
[2023-12-11T18:42:26.342Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-climate-stations.ipynb . [ 27%]
[2023-12-11T18:42:33.811Z] ...............                                                          [ 33%]
[2023-12-11T18:42:43.214Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-xclim.ipynb .....    [ 35%]
[2023-12-11T18:42:52.287Z] pavics-sdi-master/docs/source/notebooks/esgf-dap.ipynb ......            [ 37%]
[2023-12-11T18:43:09.240Z] pavics-sdi-master/docs/source/notebooks/forecasts.ipynb ......           [ 39%]
[2023-12-11T18:43:10.629Z] pavics-sdi-master/docs/source/notebooks/jupyter_extensions.ipynb .       [ 40%]
[2023-12-11T18:43:16.679Z] pavics-sdi-master/docs/source/notebooks/opendap.ipynb .......            [ 42%]
[2023-12-11T18:43:21.448Z] pavics-sdi-master/docs/source/notebooks/pavics_thredds.ipynb .....       [ 44%]
[2023-12-11T18:48:19.367Z] pavics-sdi-master/docs/source/notebooks/regridding.ipynb ............... [ 50%]
[2023-12-11T18:49:46.085Z] .............                                                            [ 55%]
[2023-12-11T18:49:49.652Z] pavics-sdi-master/docs/source/notebooks/rendering.ipynb ....             [ 56%]
[2023-12-11T18:49:52.270Z] pavics-sdi-master/docs/source/notebooks/subset-user-input.ipynb ........ [ 59%]
[2023-12-11T18:50:09.132Z] .................                                                        [ 66%]
[2023-12-11T18:50:17.041Z] pavics-sdi-master/docs/source/notebooks/subsetting.ipynb ......          [ 68%]
[2023-12-11T18:50:18.438Z] pavics-sdi-master/docs/source/notebook-components/weaver_example.ipynb . [ 68%]
[2023-12-11T18:50:35.994Z] .........                                                                [ 72%]
[2023-12-11T18:50:46.488Z] finch-master/docs/source/notebooks/dap_subset.ipynb ...........          [ 76%]
[2023-12-11T18:50:55.345Z] finch-master/docs/source/notebooks/finch-usage.ipynb ......              [ 78%]
[2023-12-11T18:50:57.267Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-1DataAccess.ipynb . [ 78%]
[2023-12-11T18:51:00.077Z] ......                                                                   [ 81%]
[2023-12-11T18:51:08.223Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-2Subsetting.ipynb . [ 81%]
[2023-12-11T18:51:24.612Z] .............                                                            [ 86%]
[2023-12-11T18:51:34.639Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb . [ 86%]
[2023-12-11T18:52:11.234Z] ....s.                                                                   [ 89%]
[2023-12-11T18:52:19.374Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-4Ensembles.ipynb . [ 89%]
[2023-12-11T18:52:32.692Z] ...                                                                      [ 90%]
[2023-12-11T18:52:47.618Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb . [ 90%]
[2023-12-11T18:53:11.503Z] ......                                                                   [ 93%]
[2023-12-11T18:53:13.442Z] notebooks/hummingbird.ipynb ............                                 [ 97%]
[2023-12-11T18:55:59.294Z] notebooks/stress-tests.ipynb ......                                      [100%]
[2023-12-11T18:55:59.294Z] 
[2023-12-11T18:55:59.294Z] =================================== FAILURES ===================================

crim-jenkins-bot · 2023-12-11T20:02:58Z

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/2360/
Result : success

BIRDHOUSE_DEPLOY_BRANCH : update-code-comment
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-20.rdext.crim.ca

PAVICS-e2e-workflow-tests Pipeline Results

Tests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1478/

NOTEBOOK TEST RESULTS

    
[2023-12-11T19:42:11.434Z] ============================= test session starts ==============================
[2023-12-11T19:42:11.434Z] platform linux -- Python 3.9.16, pytest-7.3.1, pluggy-1.0.0
[2023-12-11T19:42:11.434Z] rootdir: /home/jenkins/agent/workspace/PAVICS-e2e-workflow-tests_master
[2023-12-11T19:42:11.434Z] plugins: anyio-3.6.1, dash-2.10.0, nbval-0.9.6, tornasync-0.6.0.post2, xdist-3.3.1
[2023-12-11T19:42:11.434Z] collected 265 items
[2023-12-11T19:42:11.434Z] 
[2023-12-11T19:42:23.561Z] notebooks-auth/geoserver.ipynb ..................                        [  6%]
[2023-12-11T19:42:52.924Z] notebooks-auth/test_cowbird_jupyter.ipynb ..........                     [ 10%]
[2023-12-11T19:42:57.878Z] notebooks-auth/test_thredds.ipynb ...........                            [ 14%]
[2023-12-11T19:43:06.538Z] pavics-sdi-master/docs/source/notebooks/WCS_example.ipynb .......        [ 17%]
[2023-12-11T19:43:16.699Z] pavics-sdi-master/docs/source/notebooks/WFS_example.ipynb ......         [ 19%]
[2023-12-11T19:43:28.778Z] pavics-sdi-master/docs/source/notebooks/WMS_example.ipynb ........       [ 22%]
[2023-12-11T19:50:53.145Z] pavics-sdi-master/docs/source/notebooks/climex.ipynb ............        [ 27%]
[2023-12-11T19:50:53.145Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-climate-stations.ipynb . [ 27%]
[2023-12-11T19:51:00.480Z] ...............                                                          [ 33%]
[2023-12-11T19:51:09.896Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-xclim.ipynb .....    [ 35%]
[2023-12-11T19:51:18.193Z] pavics-sdi-master/docs/source/notebooks/esgf-dap.ipynb ......            [ 37%]
[2023-12-11T19:51:34.954Z] pavics-sdi-master/docs/source/notebooks/forecasts.ipynb ......           [ 39%]
[2023-12-11T19:51:36.335Z] pavics-sdi-master/docs/source/notebooks/jupyter_extensions.ipynb .       [ 40%]
[2023-12-11T19:51:42.211Z] pavics-sdi-master/docs/source/notebooks/opendap.ipynb .......            [ 42%]
[2023-12-11T19:51:46.619Z] pavics-sdi-master/docs/source/notebooks/pavics_thredds.ipynb .....       [ 44%]
[2023-12-11T19:54:58.602Z] pavics-sdi-master/docs/source/notebooks/regridding.ipynb ............... [ 50%]
[2023-12-11T19:56:13.841Z] .............                                                            [ 55%]
[2023-12-11T19:56:15.318Z] pavics-sdi-master/docs/source/notebooks/rendering.ipynb ....             [ 56%]
[2023-12-11T19:56:17.640Z] pavics-sdi-master/docs/source/notebooks/subset-user-input.ipynb ........ [ 59%]
[2023-12-11T19:56:34.365Z] .................                                                        [ 66%]
[2023-12-11T19:56:41.545Z] pavics-sdi-master/docs/source/notebooks/subsetting.ipynb ......          [ 68%]
[2023-12-11T19:56:42.934Z] pavics-sdi-master/docs/source/notebook-components/weaver_example.ipynb . [ 68%]
[2023-12-11T19:56:59.780Z] .........                                                                [ 72%]
[2023-12-11T19:57:11.271Z] finch-master/docs/source/notebooks/dap_subset.ipynb ...........          [ 76%]
[2023-12-11T19:57:20.262Z] finch-master/docs/source/notebooks/finch-usage.ipynb ......              [ 78%]
[2023-12-11T19:57:22.183Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-1DataAccess.ipynb . [ 78%]
[2023-12-11T19:57:24.989Z] ......                                                                   [ 81%]
[2023-12-11T19:57:33.135Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-2Subsetting.ipynb . [ 81%]
[2023-12-11T19:57:47.737Z] .............                                                            [ 86%]
[2023-12-11T19:57:57.743Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb . [ 86%]
[2023-12-11T19:58:34.343Z] ....s.                                                                   [ 89%]
[2023-12-11T19:58:40.931Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-4Ensembles.ipynb . [ 89%]
[2023-12-11T19:58:56.459Z] ...                                                                      [ 90%]
[2023-12-11T19:59:11.389Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb . [ 90%]
[2023-12-11T19:59:33.925Z] ......                                                                   [ 93%]
[2023-12-11T19:59:35.592Z] notebooks/hummingbird.ipynb ............                                 [ 97%]
[2023-12-11T20:02:15.485Z] notebooks/stress-tests.ipynb ......                                      [100%]
[2023-12-11T20:02:15.485Z] 
[2023-12-11T20:02:15.485Z] ================= 264 passed, 1 skipped in 1202.60s (0:20:02) ==================

tlvu added 7 commits July 27, 2023 12:09

certbotwrapper: update comment where var BASH_IMAGE comes from

172ba13

Merge remote-tracking branch 'origin/master' into update-code-comment

efaad29

config: document another reason to allow not existing conf dir in EXT…

838ee0f

…RA_CONF_DIRS

Merge remote-tracking branch 'origin/master' into update-code-comment

62ac0fa

CHANGES: extra reason to allow not existing dir in EXTRA_CONF_DIRS

6e60c56

twitcher: fix unable to change log level because of typo in qualname …

bda91a7

…config

Merge remote-tracking branch 'origin/master' into update-code-comment

f5f0e41

tlvu requested review from mishaschwartz and fmigneault December 11, 2023 18:19

github-actions bot added ci/deployment Related to deployment utilities and scripts component/twitcher Related to https://github.com/bird-house/twitcher documentation Improvements or additions to documentation labels Dec 11, 2023

mishaschwartz requested changes Dec 11, 2023

View reviewed changes

update comment per review feedback

a527e99

tlvu requested a review from mishaschwartz December 11, 2023 19:32

mishaschwartz approved these changes Dec 11, 2023

View reviewed changes

tlvu mentioned this pull request Dec 11, 2023

💡 [Feature] Twitcher: Log WARN/ERROR level of gunicor/pyramid in docker logs twitcher #411

Open

fmigneault approved these changes Dec 11, 2023

View reviewed changes

Bump version: 2.0.0 → 2.0.1

eb75106

github-actions bot added the ci/operations Continuous Integration components label Dec 11, 2023

tlvu merged commit 92bc4b6 into master Dec 11, 2023
3 of 5 checks passed

tlvu deleted the update-code-comment branch December 11, 2023 22:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Document extra reason to allow not existing dir in `EXTRA_CONF_DIRS`, fix unable to change Twitcher logging level #410

Document extra reason to allow not existing dir in `EXTRA_CONF_DIRS`, fix unable to change Twitcher logging level #410

tlvu commented Dec 11, 2023 •

edited

Loading

mishaschwartz left a comment

mishaschwartz Dec 11, 2023

tlvu Dec 11, 2023

mishaschwartz Dec 11, 2023

tlvu Dec 11, 2023

crim-jenkins-bot commented Dec 11, 2023

crim-jenkins-bot commented Dec 11, 2023

Document extra reason to allow not existing dir in EXTRA_CONF_DIRS, fix unable to change Twitcher logging level #410

Document extra reason to allow not existing dir in EXTRA_CONF_DIRS, fix unable to change Twitcher logging level #410

Conversation

tlvu commented Dec 11, 2023 • edited Loading

Changes

mishaschwartz left a comment

Choose a reason for hiding this comment

mishaschwartz Dec 11, 2023

Choose a reason for hiding this comment

tlvu Dec 11, 2023

Choose a reason for hiding this comment

mishaschwartz Dec 11, 2023

Choose a reason for hiding this comment

tlvu Dec 11, 2023

Choose a reason for hiding this comment

crim-jenkins-bot commented Dec 11, 2023

E2E Test Results

DACCS-iac Pipeline Results

PAVICS-e2e-workflow-tests Pipeline Results

crim-jenkins-bot commented Dec 11, 2023

E2E Test Results

DACCS-iac Pipeline Results

PAVICS-e2e-workflow-tests Pipeline Results

Document extra reason to allow not existing dir in `EXTRA_CONF_DIRS`, fix unable to change Twitcher logging level #410

Document extra reason to allow not existing dir in `EXTRA_CONF_DIRS`, fix unable to change Twitcher logging level #410

tlvu commented Dec 11, 2023 •

edited

Loading